welo git mirrors - /page/commit.mu

Node / public / rns-proxy / commits / 2730708

🗀 Browse tree at this commit

Parents : 7f32542

Author : welo | main nixos computer <empty@empty.com>

Date : 2026-07-08T11:46:18+01:00

stuff

3 files changed, 10 insertions(+), 4 deletions(-)

M src/client.rs +2

M src/mux.rs +4 -1

M src/server.rs +4 -3

diff --git a/src/client.rs b/src/client.rs

index 4b8af12..2f942d1 100644

--- a/src/client.rs

+++ b/src/client.rs

@@ -372,6 +372,8 @@ pub async fn connect_tcp_server_side(

// Wait for CONN_OK or CONN_ERR with timeout

tokio::time::timeout(Duration::from_secs(15), async {

while let Some(frame) = session_rx.recv().await {

+ println!("type: {:?}", frame.frame_type);

+ println!("type: {:?}", frame.session_id);

match frame.frame_type {

FrameType::ConnectOk => return Ok(()),

FrameType::ConnectErr => {

diff --git a/src/mux.rs b/src/mux.rs

index 95ebd59..9d1cbfd 100644

--- a/src/mux.rs

+++ b/src/mux.rs

@@ -17,7 +17,7 @@

use std::collections::HashMap;

use std::sync::{Arc, Mutex};

-use log::{debug, warn};

+use log::{debug, info, warn};

use rns_core::constants::LINK_MDU;

use rns_net::{LinkId, RnsNode};

use tokio::sync::mpsc;

@@ -106,6 +106,7 @@ impl MuxHandle {

/// each chunk is sent as a separate `send_on_link` call with `CONTEXT_NONE`.

/// The receiver reassembles using the frame length header.

pub fn send_frame(&self, frame: &Frame) {

+ info!("a");

let link_id = match *self.inner.link_id.lock().unwrap() {

Some(id) => id,

None => {

@@ -113,6 +114,7 @@ impl MuxHandle {

return;

}

};

+ info!("b");

let encoded = frame.encode();

let node = &self.inner.node;

@@ -128,6 +130,7 @@ impl MuxHandle {

/// Convenience: send a typed frame.

pub fn send(&self, frame_type: FrameType, session_id: u32, payload: Vec<u8>) {

+ info!("send frame");

self.send_frame(&Frame::new(frame_type, session_id, payload));

}

diff --git a/src/server.rs b/src/server.rs

index 48c0f7d..2083811 100644

--- a/src/server.rs

+++ b/src/server.rs

@@ -216,9 +216,9 @@ async fn handle_server_session_tcp(

filter_config: FilterConfig

) {

- info!("start");

+ info!("{} start", sid);

if let Some(socket) = filter_and_convert(addr.clone(), Some(&filter_config)).await {

- info!("hi");

+ info!("{} hi", sid);

let stream = match TcpStream::connect(socket).await {

Ok(s) => s,

Err(e) => {

@@ -228,12 +228,13 @@ async fn handle_server_session_tcp(

return;

}

};

- info!("idk");

+ info!("{} idk", sid);

// Signal success

mux.send(FrameType::ConnectOk, sid, Vec::new());

// Data relay (shared implementation)

+ info!("{} streaming", sid);

relay_bidirectional_tcp(sid, stream, mux, session_rx).await;

info!("[{}] TCP Closed", sid);

} else {